http://llvm.org/bugs/show_bug.cgi?id=10248 git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@134327 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/__bit_reference b/include/__bit_reference index 57b92ea..d62bec7 100644 --- a/include/__bit_reference +++ b/include/__bit_reference
@@ -21,7 +21,13 @@ template <class _C, bool _IsConst> class __bit_iterator; template <class _C> class __bit_const_reference; -template <class _C> +template <class _Tp> +struct __has_storage_type +{ + static const bool value = false; +}; + +template <class _C, bool = __has_storage_type<_C>::value> class __bit_reference { typedef typename _C::__storage_type __storage_type; @@ -66,6 +72,11 @@ : __seg_(__s), __mask_(__m) {} }; +template <class _C> +class __bit_reference<_C, false> +{ +}; + template <class _C, class _D> _LIBCPP_INLINE_VISIBILITY inline void diff --git a/include/bitset b/include/bitset index de0a201..f0e8027 100644 --- a/include/bitset +++ b/include/bitset
@@ -130,6 +130,15 @@ _LIBCPP_BEGIN_NAMESPACE_STD template <size_t _N_words, size_t _Size> +class __bitset; + +template <size_t _N_words, size_t _Size> +struct __has_storage_type<__bitset<_N_words, _Size> > +{ + static const bool value = true; +}; + +template <size_t _N_words, size_t _Size> class __bitset { public: diff --git a/include/vector b/include/vector index 0bd82ea..d8c9feb 100644 --- a/include/vector +++ b/include/vector
@@ -1749,6 +1749,12 @@ template <class _Allocator> struct hash<vector<bool, _Allocator> >; template <class _Allocator> +struct __has_storage_type<vector<bool, _Allocator> > +{ + static const bool value = true; +}; + +template <class _Allocator> class _LIBCPP_VISIBLE vector<bool, _Allocator> : private __vector_base_common<true> { @@ -1757,8 +1763,6 @@ typedef bool value_type; typedef _Allocator allocator_type; typedef allocator_traits<allocator_type> __alloc_traits; - typedef __bit_reference<vector> reference; - typedef __bit_const_reference<vector> const_reference; typedef typename __alloc_traits::size_type size_type; typedef typename __alloc_traits::difference_type difference_type; typedef __bit_iterator<vector, false> pointer; @@ -1798,6 +1802,9 @@ size_type __size_; __compressed_pair<size_type, __storage_allocator> __cap_alloc_; + typedef __bit_reference<vector> reference; + typedef __bit_const_reference<vector> const_reference; + _LIBCPP_INLINE_VISIBILITY size_type& __cap() _NOEXCEPT {return __cap_alloc_.first();} 